Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 19:42:27 +0000 (20:42 +0100)
committerJan D. <jan.h.d@swipnet.se>
Wed, 6 Jan 2010 19:42:27 +0000 (20:42 +0100)
commit15461b36ca1ff814c7db404ef940bd85a824b119
tree19c17a3ff40dd3ea94a66c6ad3b297f09fdd9f61
parentb754521a359a7ad6edb293592f3968b4c50e3321
parentb35cf26c2342eb1bf62326002679c49bb3c82a3d
Merge from trunk
src/ChangeLog